Package source files rearranged