Changed folder names

I like it to be consistent :)