Moved files to more logical folders