Directory cleanup and updated gitignore