Moved classes from library to baseLibrary

Added tests for some classes.
28 files changed