Do some refactoring. Starting project from scratch.