Moved some classes to library since they became common to multiple apps