move all sources to new dir
update to control flow