Move partial templates to within corresponding components
Move JS tests to within components