Refactor Entire Codebase

Fixes #1