removed device modules that were placed incorrectly
adding back in submodules