cleanup
reorganize file structure