Strip whitespace
Move types into correct packages~