moved files into better directory structure