Change directory structure
Add history
Bug fix