restructured into directories