refactor base/ directory per issue #42