Better handling of multiple request handlers
Removed old files