Organize types / methods a bit