rearranged file structure misc refact