Move interfaces and constants up