CHANGE: structure change, components menu items and files