Flattened hierarchy to make imports easier