broke of the classes to independent files