Identation... what i've done
Put things in their folders