Changed name of folder, some clean up of the code