Moved AspectFactory to spi, added ability to store line number in URI