Remove deprecated files
Move extern declaration to header file