Merge pull request #1 from Blir/dev

Dev
Merge pull request #2 from Blir/dev

Better file organization; fixed issues with missing libraries
2.0.1
v3.0.0
Removed unnecessary library

Removed 1.6.2 jar and changed project properties to use the correct
library
Merge pull request #4 from Blir/master

Updating dev branch to reflect updated master