Cuttlefish support
Refactor cuttlefish-related files
Merge branch 'feature/cuttlefish-support' into develop