Added project file, and fixed compilation issue
Removed duplicate files