Move Attachment class into its own file