big code refactor

moves constants to seperate classes