Code cleanup upto graphics directory, the others to follow.