house cleaning
compacted classes into two files
further compactig of classes