Remove old comment
Intro messages
Split classes into files.