changed tests to simpler dir structure for issue #15
added cli usage for --webserver issue #18