cleaned up directories; added new functionality
lots of changes, march 21