Moved, made the file structure smaller, and rewrote quickly.