Changed the file structure and added the appropriate code to deal with it.