Merge pull request #10 from hmert/master

More Structured and categorized