Continued from last commit with moved files