Fixes src directory layout