Changed packages
Fixed income fragment
Moved some methods to Utils