restructure and git ignores