Moved vars, consts and types from main.go to files where they do belong