beutifying code and imports

moving stuff arround, and constants to the config