changed directory name
began fixing up base