Cleanup
Renamed file
Fixed usage section