moving classes to files