Remove Comment.cs and Moved Comments to Base