Reorganization. Generated app happens outside 'internal
'. Bug fixes