Remove explicit type declaration. Attributes in own folder.