Moved the defs folder out of the src folder, and rearranged the imports to get the right output order