reorganize file structure
merging