diff --git a/modules-mls.conf b/modules-mls.conf
index 156fff2..38e3ff0 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -23,7 +23,7 @@ accountsd = module
 #
 # Berkeley process accounting
 # 
-acct = base
+acct = module
 
 # Layer: admin
 # Module: alsa
@@ -93,7 +93,7 @@ amavis = module
 #
 # Policy for the Anaconda installer.
 # 
-anaconda = base
+anaconda = module
 
 # Layer: services
 # Module: apache
@@ -107,7 +107,7 @@ apache = module
 #
 # Advanced power management daemon
 # 
-apm = base
+apm = module
 
 # Layer: system
 # Module: application
@@ -136,7 +136,7 @@ audioentropy = module
 #
 # Common policy for authentication and user login.
 # 
-authlogin = base
+authlogin = module
 
 # Layer: services
 # Module: automount
@@ -200,7 +200,7 @@ ubac = base
 #
 # Policy for the kernel modules, kernel image, and bootloader.
 # 
-bootloader = base
+bootloader = module
 
 
 # Layer: services
@@ -293,7 +293,7 @@ clamav = module
 #
 # Policy for reading and setting the hardware clock.
 # 
-clock = base
+clock = module
 
 # Layer: services
 # Module: consolekit
@@ -307,7 +307,7 @@ consolekit = module
 #
 # Determine of the console connected to the controlling terminal.
 # 
-consoletype = base
+consoletype = module
 
 # Layer: kernel
 # Module: corecommands
@@ -316,7 +316,7 @@ consoletype = base
 # Core policy for shells, and generic programs
 # in /bin, /sbin, /usr/bin, and /usr/sbin.
 # 
-corecommands = base
+corecommands = module
 
 # Layer: kernel
 # Module: corenetwork
@@ -331,14 +331,14 @@ corenetwork = base
 #
 # Services for loading CPU microcode and CPU frequency scaling.
 # 
-cpucontrol = base
+cpucontrol = module
 
 # Layer: services
 # Module: cron
 #
 # Periodic execution of scheduled commands.
 # 
-cron = base
+cron = module
 
 # Layer: services
 # Module: cups
@@ -387,7 +387,7 @@ dbskk = module
 #
 # Desktop messaging bus
 # 
-dbus = base
+dbus = module
 
 # Layer: services
 # Module: dcc
@@ -444,7 +444,7 @@ distcc = off
 #
 # Policy for dmesg.
 # 
-dmesg = base
+dmesg = module
 
 # Layer: admin
 # Module: dmidecode
@@ -547,7 +547,7 @@ finger = module
 # Final system configuration run during the first boot
 # after installation of Red Hat/Fedora systems.
 # 
-firstboot = base
+firstboot = module
 
 # Layer: apps
 # Module: firewallgui
@@ -568,7 +568,7 @@ fprintd = module
 #
 # Tools for filesystem management, such as mkfs and fsck.
 # 
-fstools = base
+fstools = module
 
 # Layer: services
 # Module: ftp
@@ -589,7 +589,7 @@ games = module
 #
 # Policy for getty.
 # 
-getty = base
+getty = module
 
 # Layer: apps
 # Module: gnome
@@ -645,7 +645,7 @@ psad = module
 #
 # Policy for changing the system host name.
 # 
-hostname = base
+hostname = module
 
 
 # Layer: system
@@ -654,7 +654,7 @@ hostname = base
 # Policy for hotplug system, for supporting the
 # connection and disconnection of devices at runtime.
 # 
-hotplug = base
+hotplug = module
 
 # Layer: services
 # Module: howl
@@ -668,14 +668,14 @@ howl = module
 #
 # Internet services daemon.
 # 
-inetd = base
+inetd = module
 
 # Layer: system
 # Module: init
 #
 # System initialization programs (init and init scripts).
 # 
-init = base
+init = module
 
 # Layer: services
 # Module: inn
@@ -689,7 +689,7 @@ inn = module
 #
 # Policy for iptables.
 # 
-iptables = base
+iptables = module
 
 # Layer: system
 # Module: ipsec
@@ -710,7 +710,7 @@ irc = module
 #
 # IRQ balancing daemon
 # 
-irqbalance = base
+irqbalance = module
 
 # Layer: system
 # Module: iscsi
@@ -789,7 +789,7 @@ ktalk = module
 #
 # Hardware detection and configuration tools
 # 
-kudzu = base
+kudzu = module
 
 
 # Layer: services
@@ -811,21 +811,21 @@ ldap = module
 #
 # Policy for system libraries.
 # 
-libraries = base
+libraries = module
 
 # Layer: apps
 # Module: loadkeys
 #
 # Load keyboard mappings.
 # 
-loadkeys = base
+loadkeys = module
 
 # Layer: system
 # Module: locallogin
 #
 # Policy for local logins.
 # 
-locallogin = base
+locallogin = module
 
 # Layer: apps
 # Module: lockdev
@@ -839,21 +839,21 @@ lockdev = module
 #
 # Policy for the kernel message logger and system logging daemon.
 # 
-logging = base
+logging = module
 
 # Layer: admin
 # Module: logrotate
 #
 # Rotate and archive system logs
 # 
-logrotate = base
+logrotate = module
 
 # Layer: services
 # Module: logwatch
 #
 # logwatch executable
 # 
-logwatch = base
+logwatch = module
 
 # Layer: services
 # Module: lpd
@@ -867,14 +867,14 @@ lpd = module
 #
 # Policy for logical volume management programs.
 # 
-lvm = base
+lvm = module
 
 # Layer: admin
 # Module: mcelog
 #
 # mcelog is a daemon that collects and decodes Machine Check Exception data on x86-64 machines. 
 # 
-mcelog = base
+mcelog = module
 
 # Layer: services
 # Module: mailman
@@ -896,7 +896,7 @@ mcs = base
 #
 # Miscelaneous files.
 # 
-miscfiles = base
+miscfiles = module
 
 # Layer: kernel
 # Module: mls
@@ -918,7 +918,7 @@ modemmanager = module
 #
 # Policy for kernel module utilities
 # 
-modutils = base
+modutils = module
 
 # Layer: services
 # Module: mojomojo
@@ -939,7 +939,7 @@ mono = module
 #
 # Policy for mount.
 # 
-mount = base
+mount = module
 
 # Layer: apps
 # Module: mozilla
@@ -995,7 +995,7 @@ mrtg = module
 #
 # Policy common to all email tranfer agents.
 # 
-mta = base
+mta = module
 
 # Layer: services
 # Module: mysql
@@ -1023,14 +1023,14 @@ ncftool = module
 #
 # Network analysis utilities
 # 
-netutils = base
+netutils = module
 
 # Layer: services
 # Module: networkmanager
 #
 # Manager for dynamically switching between networks.
 # 
-networkmanager = base
+networkmanager = module
 
 # Layer: services
 # Module: nis
@@ -1045,7 +1045,7 @@ nis = module
 #
 # Name service cache daemon
 # 
-nscd = base
+nscd = module
 
 
 # Layer: services
@@ -1104,7 +1104,7 @@ openct = module
 #
 # PCMCIA card management services
 # 
-pcmcia = base
+pcmcia = module
 
 # Layer: services
 # Module: pegasus
@@ -1160,7 +1160,7 @@ ppp = module
 #
 # Manage temporary directory sizes and file ages
 # 
-prelink = base
+prelink = module
 
 # Layer: services
 # Module: procmail
@@ -1209,14 +1209,14 @@ qpidd = module
 #
 # File system quota management
 # 
-quota = base
+quota = module
 
 # Layer: system
 # Module: raid
 #
 # RAID array management tools
 # 
-raid = base
+raid = module
 
 # Layer: services
 # Module: radius
@@ -1237,7 +1237,7 @@ radvd = module
 #
 # Readahead, read files into page cache for improved performance
 # 
-readahead = base
+readahead = module
 
 # Layer: services
 # Module: rgmanager
@@ -1293,14 +1293,14 @@ roundup = module
 #
 # Remote Procedure Call Daemon for managment of network based process communication
 # 
-rpc = base
+rpc = module
 
 # Layer: admin
 # Module: rpm
 #
 # Policy for the RPM package manager.
 # 
-rpm = base
+rpm = module
 
 
 # Layer: services
@@ -1343,7 +1343,7 @@ sasl = module
 #
 # Policy for sendmail.
 # 
-sendmail = base
+sendmail = module
 
 # Layer: apps
 # Module: seunshare
@@ -1395,7 +1395,7 @@ selinux = base
 #
 # Policy for SELinux policy and userland applications.
 # 
-selinuxutil = base
+selinuxutil = module
 
 # Layer: system
 # Module: setrans
@@ -1410,7 +1410,7 @@ setrans = base
 #
 # Policy for the SELinux troubleshooting utility
 # 
-setroubleshoot = base
+setroubleshoot = module
 
 # Layer: services
 # Module: slrnpull
@@ -1459,7 +1459,7 @@ squid = module
 #
 # Secure shell client and server policy.
 # 
-ssh = base
+ssh = module
 
 # Layer: services
 # Module: sssd
@@ -1473,7 +1473,7 @@ sssd = module
 #
 # Policy controlling access to storage devices
 # 
-storage = base
+storage = module
 
 # Layer: services
 # Module: stunnel
@@ -1487,14 +1487,14 @@ stunnel = module
 #
 # Run shells with substitute user and group
 # 
-su = base
+su = module
 
 # Layer: admin
 # Module: sudo
 #
 # Execute a command with a substitute user
 # 
-sudo = base
+sudo = module
 
 # Layer: system
 # Module: systemd
@@ -1508,7 +1508,7 @@ systemd = module
 #
 # Policy for network configuration: ifconfig and dhcp client.
 # 
-sysnetwork = base
+sysnetwork = module
 
 # Layer: services
 # Module: sysstat
@@ -1543,14 +1543,14 @@ tgtd = module
 #
 # Policy for udev.
 # 
-udev = base
+udev = module
 
 # Layer: system
 # Module: userdomain
 #
 # Policy for user domains
 # 
-userdomain = base
+userdomain = module
 
 # Layer: services
 # Module: ulogd
@@ -1578,7 +1578,7 @@ wireshark = module
 #
 # Policy for tzdata-update
 # 
-tzdata = base
+tzdata = module
 
 # Layer: apps
 # Module: userhelper
@@ -1648,7 +1648,7 @@ qemu = module
 #
 # Utilities for configuring the linux ethernet bridge
 # 
-brctl = base
+brctl = module
 
 # Layer: services
 # Module: telnet
@@ -1711,7 +1711,7 @@ xfs = module
 #
 # X windows login display manager
 # 
-xserver = base
+xserver = module
 
 # Layer: services
 # Module: zebra
@@ -1725,14 +1725,14 @@ zebra = module
 #
 # Policy for managing user accounts.
 # 
-usermanage = base
+usermanage = module
 
 # Layer: admin
 # Module: updfstab
 #
 # Red Hat utility to change /etc/fstab.
 # 
-updfstab = base
+updfstab = module
 
 # Layer: admin
 # Module: vpn
@@ -1746,7 +1746,7 @@ vpn = module
 #
 # run real-mode video BIOS code to alter hardware state
 # 
-vbetool = base
+vbetool = module
 
 # Layer: kernel
 # Module: terminal
@@ -1903,7 +1903,7 @@ staff = module
 #
 # System Administrator
 # 
-sysadm = base
+sysadm = module
 
 # Layer: role
 # Module: unprivuser