Fixed src directory structure