Rearranged files for compatibility with spatcontrol