Change structure and make first unit test
Include new structure
Include new structure