updating structure
Merge pull request #72 from postcode/develop

updating structure