Reorganize, the attachment code will become a reusable panel