More Cleanup, moved handlers into folder, removed a lot of usings that wasn't beeing used