Moved some files to make it easier for refactoring into multiple modules.