Add indicator module

Also, move command line arguments into package