Modified the folder structure and build.sbt, in order to have a painless one-step packaging.