Remove echos
Change module inclusion to provide complete module paths