Moved classes to new package