Add some hierarchy to the source files