Commiting changes to file structure and removing unnecessary pieces