Rearraning file and correcting issues with modular files.