Code DRY, moved files from routes to scr, event lisener moved to new file, code pretified a bit ;)