moved classes to packages
fixed bug with embeddable, change version to 1.1.4-SNAPSHOT
change version to 1.1.4
Merge branch 'master' into develop