refactor classes in __init__ into their own modules