Restructured project to make room for unjit tests

Because the original structure was a dead end I have started a new and
lets hope that this time it will be better.