Moved files under Server dir