renamed package
fix infinite loop, todo: more refactoring