reorganized components

[erenfn]

• put components that are only used by one parent component in the same folder as their parent's
• moved templates out of components folder