Change file structure, Add point manager