Readd moved files to the project and fix some compilation warnings

Signed-off-by: MHesham <mhesham.fcis@gmail.com>