Moved classes to separate packages