moving class to separate file