Add forgotten classes. Move classes. Organize imports.