Reorganised folder structure to follow Golang's guidlines