Clean up
I only dare to test my app now
shortcuts and structures modules are obsolete now
Fixed, _ should be transfered back to - when constructing a http header