reorg folder structure to allow easier scaling