Moved classes to proper package