Initial skeleton structure.
merged with master