Misc
Generic base object
small changes
Moved some packages to other files