Change project structure a bit more to make it easier to drop in