Refactored and renamed some files.