project restructure

this marks a good state