Refactoring
New project structure, states