Reorganize! Namespace, test data, stub methods, ...