Moved general classes to general package