Refactoring directory structure to be more 'go-like'