new foldering layout. changes to build files