Refactor cuttlefish-related files