fix
moved policies
renamed methods and move factories