Huge renaming, little refactor, comments.
Renaming/refactor + huge comments