modified function declarations
Renaming files.