Source files restructured