Big Changes

Simplified includes, changed js structure, changes less structure. Much
better to say the least.