Cleaning up code and adding the rest of the files