- added most classes; separated between core and UI