Make project layout more consistent