Refined source file structure