Cleaned up the directories and files and code.