Moved code into bundle top directory.
Readded target-dir directive.