Removed submodule and just added to project. I couldn't get them to work
as I wanted and I feel the SharedPackages was just unnessesary. Also
moved some files around to be clearer, may need to do this again in the
future.