Move helper class to lib/, models to models