arrange file structure & modify gitignore