Removed superflous module.  Made changes to design