did some moving/refactoring