Moved classes to dedicated package