Renamed some files and refactored a little.