More stuctured file
Merge branch 'master' of https://github.com/tsaastam/yhack-2013