Reorder files and modify usage