Add comments and seperate into directories