adds load method and restructures files