Improve class and file naming
Maintain each section in a separate file
Improve contents