Reorganized folder, added positioning assignments