Changed directory structure for easier use as a submodule in other projects.