reorganize file structure, edit comments