Moved constant interfaces in their class