Cleanup

Renamed files (sorry git), cleaned up comments.