Restructured everything. No it's better, I think.
It has been a while since I last committed, I've been very busy.