moved baseclass into core and removed system directory.