udpated structure
g
Merge github.com:christian-fei/christian-fei.github.com