Refractoring

could not rename packages in test folder for some reason