Cleaned up structure

I also added Factories, Events and implemented the RFC6455 stubs