Re-structuring the directory