Reorganized stuff, added .gitignore