Moved fakes to a separated folder
Removed obsolete includes