Removed bundle prefix in autoload and target-dir