Add Classes + Rename Classes

Read title...