Fix the folder layout so we can have more than one project under src