Lots of fixes! Added package searching for inbuilt class shortcuts