Iron-router added. Some refactoring.