Updated project structure - optimizing directory/file layout