Reorganized file structure and externalized some classes regarding their specific functionality.