Add meta information
Move classes into actual package
Merge branch 'develop'