Back to normal project layout