made proxy folders for modules that need to be broken out w/ mikey
resolving merge