Change Ubuntu files locaiton, move data under OS version