Move class files to Sources
Move template functions