Moved classes to their own packages