project layout (I think) complete