Added basic structure and classes