reorganize file structures