Cleanup
Store filename and directory separately in the database