Moved stuff around to make it work better with default go dir layout