EOD push
Annotation and code-re-organization started