Adding the shared directory and a few other changes