Massive rearrange directories and gitignore adds