Changed structure

Added base-module. Need fixes for the majordomo.utils import.