An entity and its related architectures should be defined in separate files. It would allow compilation of a specific architecture without forcing to recompile its entity and all the files using this entity.
entity e is end; architecture a of e is begin end;
entity e is end;File 2 defining the architecture:
architecture a of e is begin end;