Move models and Lib into their respective folders as well as migrate some methods to Helper