Refactored some improper naming of directories and files.