Improve of the look and feel, refactoring of the code, refactoring of the file structure