Reorganize declarations and interfaces