finished sepatating of classes