Updated project layout