Merge pull request #1 from Mitsugaru/master

Redesign & Restructuring