Loader page, re-arrange package