Changed package structure and moved Fifo from utils to router
Moved Main out of router package
Moved test-classes out of the router package