[REORG] better file structure

reshuffle some things to make them
more in line with proper file structure