Refactoring project, one module per types of states