Organized consts a bit. Moved os changes to main