File organize

Removed prototypes and duplicates