changing package structure, refactoring states system