Rework the 'require' and 'require_relative' calls in each file
Update the directory structure