Simplify directory structure
Update history