Move files to proper places
Update included files