refactor the directory for proper go access