Added documentation and organizational tweaks