Cleanup and rearrangement.
Add .gitignore.