Merge "Moving various application into related methods to a separate class" into main