[DIR] Change the estructure of files and directories
Merge branch 'master' of github.com:tumael/phitana

merge