Changed project structure. From static to non-static.

Now this is some OOP. Also will ease unit testing.