lib : simplify the folder structure