Some warnings fix
File moved out of folder