add ga and rearrange folders