Further organization and renaming