Removed packages folders; fixing references for some packages