Started reorganising the project. Not functional yet.
On the way.
Still hacking.