Restructured directories, fixed counter in P11