getting rid of redundant directory. Leaving andrews dir in place until I integrate all its pieces to the main code.