Remove intermediate directories from package structure
Fixed require statement in echobot