moved some stuff around
updated gitignore