Started to restructure with classes