Organize imports
Refactor

Cut main files into separate files