Adding pause features, separeting classes into files