Imrove commands
Rename files
Add some files
Cleanup