Initial implementation and restructuring of framework