Adds comments and moves classes in good place