moved files, adjusted gitignore