moving states to submodule