project structure improved, added state skipping by pressing space