Simplify build, directory structure