Reorganised and fixed HabitRPG Bug