Renamed beacuse capitalized filnename
First part of internal (interfaces) in place