Migrating classes into their own file, finalizing up language features