Removed extra directories, and edited CaLib for this data