Merge pull request #14 from OmgImAlexis/shnupbups

Lots of things and stuff
Fixed refactoring in items
Merge pull request #15 from OmgImAlexis/lex

Fixed refactoring in items
Removed stupid old import
Moved items to your way
Merge pull request #16 from OmgImAlexis/lex

Moved items
Merge pull request #17 from OmgImAlexis/master

Pulling from master.