Minor renames and such
Fixing manifest
Merge branch 'dev-gradle' into minor-refactor