Moving around some classes, refactoring the url management and fixing
some issues.