File split up + manipulation + better gitignore