fix organization of arch files