Reorganize Atachment class