restructured actor side files