few more project restructures
fixed after conflicts
last quick fix