Restructuring packages and classes to align with reading/exercise schedule