refactor things to new loquations