Rearranging some files.
Version bump.
Merge branch 'release/0.2.8' into develop