changed folder structure to comply with rules of Go