Deleting redundant modules, adding states module
Deleted more redundant modules, added media module