Moved files to more standard directory