Change plugin structure and create a Progress class definition
Clean up plugin code.