moved some files to a more logical place