Refactor on templates and moved some parts to components folders.