moved classes to their own py