Organized Componentes file.

Review for mistakes