simplify directory structure
Switched to gorilla toolkit