GEM:6 put in some actual works and such
GEM:6 more small changes due to directories