changed a lot of files location