Bug fix
Improving the structure of the project