Clean upped structure
Merge branch 'master' of https://github.com/YozhEzhi/loft-dz3