Changed structure
Merge pull request #1 from b1nd/assignment-2

Changed structure