--- a/Allura/allura/model/__init__.py
+++ b/Allura/allura/model/__init__.py
@@ -4,8 +4,9 @@
 from .session import ProjectSession
 from .neighborhood import Neighborhood, NeighborhoodFile, Theme
 from .project import Project, ProjectCategory, ProjectFile, AppConfig, SearchConfig, ScheduledMessage
-from .discuss import Discussion, Thread, PostHistory, Post, Attachment
-from .artifact import Artifact, Message, VersionedArtifact, Snapshot, ArtifactLink, Feed, AwardFile, Award, AwardGrant, BaseAttachment
+from .discuss import Discussion, Thread, PostHistory, Post, DiscussionAttachment
+from .artifact import Artifact, Message, VersionedArtifact, Snapshot, ArtifactLink, Feed, AwardFile, Award, AwardGrant
+from .attachments import BaseAttachment
 from .auth import User, ProjectRole, OpenId, EmailAddress, ApiToken
 from .openid_model import OpenIdStore, OpenIdAssociation, OpenIdNonce
 from .filesystem import File