Better folder layout in userland