Restructured to use official development toolkit