Reduce indentation in main file a bit
Clean up structure some more