Cleaned up structure
Project structure cleaned up more