Fix a require path
Add cleanup command
Allow specifying data storage directory