Moved sources and include files