Add cleanup
* remove prefixes and suffixes
* rename some files to a better meaning