Reorganize files. Create primitives from menu.