Moved files to keep sonar standards