refactor and shorten class names. removed classes that werent useed a lot