Review project layout
New build with tons of changed