Restructured folders. Solves #10
Merge pull request #13 from lucasmarcelli/new-folders

Restructured folders. Solves #11