Great changes

I've separated in several commits for making easy understand the changes. I'm just having a problem with the example folder. Could you see what i'm doin' wrong? Maybe i've misunderstand something.

Thanks!