Split up original classes into newly created file structure.