Moved support files to relevant folders