code clean up
clean up file structure