Cleaned project structure
Merge tag 'v0.91'