Refactor project, define instructions