Moved classes into package