edited gitignore
some restructuring