Move Simple headers to Simple directory