Project structure changed + minor bugfixing
Merge branch 'master' of https://github.com/RecuencoJones/PistachoToDo