Migrated files to 0.7 (WIP)