Version update v0.6 to v0.7

Bug-fixes and general update and restructure of the codebase.