Bugfix: Set top level correctly and create fnp directory