New header/menu and new file structure for images