Cleaned up the file structure to make it uniform