control/setup modified, lock/subsys created

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>