Rearranging ASDF component files