Move this classes to their own package