Quality of life improvements, moved level to its own module