Cleaned up directories, eliminated modules, preperation for full git