Added module structure. BIG CHANGEgit pull
Resolve merge conflicts after big changes