Updated project map/architecture