restructure of files
wip code restructure