Commit major changes

Recommitting without all the file permission nonsense.