Significant change in the file structure, attempt at simplifying it.