changed folder structure into more logical approach.