restructuring - moving base modules under base/