Final
Merge pull request #4 from kalehv/ReformatStructure

Final