comments clean + move interfaces to the root