Changed location and names of classes to make it cleaner