Updated 'core' + renamed 'main' -> 'classes'.