Still redoing git structure