Better folder/namespace structure