Update: structure and start componentization