Restructured modules organization, starting tests development