Fix structure
Merge pull request #3 from unleashit/jg-working

Fix structure