Reorganise source file declaration