Update project structure; prepare it for new features