move the class to separate files