Fix all imports, each class has its own file now, misc issues
Merge pull request #484 from Gama11/dev_imports

Fix all imports, each class has its own file now, misc issues