Added files to dev branch, updated package names to fit