Progress on Organization and Documentation

Organized and marked TODO for a decent portion of the API