Cleaning up code structure and filenames