Complete restructure and new functions
Merge pull request #5 from MinekoRox/master

Complete restructure and new functions