Added module structure. BIG CHANGEgit pull