Fixed inclusion issues with src/org/* files.