Moving modules to separate directory.