Restructuring of classes into separate files