Modified to separate library and sample project model
Changed the package to try and fix Android studio bug