removed submodules (temp)
added modules back as non submodules (since github doesn't deal with submodules nicely for end users)