Fixed source/dir structure to be go standard