Cleaned up the directories and file a bit