Removed duplicate File, moved common to lib