Changed directory structure for build purposes