Base structure

Let's get back to master branch.