Project restructure + further prep for 3D change over