Switching to a src directory model