Initial structure and some refactoring