Changed to GIT structure