New folder structure. Focused on toolbar and router specific logic.