Some file rearrangement for base page