Revamping filenames.
Cleaned up removed files.
Big rewrite.