Refactoring of the src-folder