clean up code
renamed and cleaned up files