Restructuring/skinny
Merge branch 'master' of https://github.com/chaughawout/Poky