move files into more logical structure