Added pre-main capabilities, cleaned up services and NameServer modules