Improve to more standard project layout