Updated build system, directory structure