Adjust src directory structure