[Experiment] seperating classes/methods