Various changes
Various refactoring, testing new method for naming directories
Various refactoring