Moved functionality to the class file. One class one file