Started merging interfaces into modules