Began basic restructure/optimization

Removed all existing code, started re-write to clean up project and make
code more sensible and optimized.