Fix font-path variable declaration and change dir-structure