Refactored GO proj to fit future Angular works'