Updated project directory organization