reorganize file heirarchy