Major refactoring & improvements

+ yet still has some weird structures to get rid of.
+ interactivity integration is on the way.