More renaming
changed comments
renamed most files
Fixed custom message