Moved classes to libraries