Organization
More organization and update of gitignore