Removed old files, began full rewrite