renamed classes and seperated their use, not sure yet if this is a wise choice