Updated Package, Import and Class Declaration Parser