organize files more golang like