Refactor classes by moving them into their own modules