Restructured code into separate folders for actual control routines vs. helper routines