regorganized and added fstab