change: rename functions, reorganize files