Everything now registers under it's own name
Fixed items to new format
More clean up
Merge pull request #25 from OmgImAlexis/lex

Cleaning up