Moving towards a slightly more standard project layout