Refactoring directories.
More work needed : parameters imaegs etc