Separe classes, add router